From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 3 Aug 2018 00:55:07 +0000 (-0400)
Subject: color picker: Also try kwin
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~32^2~85
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=926f25aaecc0494a5aa7b1ba79fc11fdbc52c482;p=gtk%2B3.0.git

color picker: Also try kwin

use a kwin color picker when we run under kwin.
---

diff --git a/gtk/gtkcolorpicker.c b/gtk/gtkcolorpicker.c
index d57ffe016e..6b3f5f79c1 100644
--- a/gtk/gtkcolorpicker.c
+++ b/gtk/gtkcolorpicker.c
@@ -20,7 +20,7 @@
 #include "gtkcolorpickerprivate.h"
 #include "gtkcolorpickerportalprivate.h"
 #include "gtkcolorpickershellprivate.h"
-#include "gtkprivate.h"
+#include "gtkcolorpickerkwinprivate.h"
 #include <gio/gio.h>
 
 
@@ -53,15 +53,16 @@ gtk_color_picker_new (void)
 {
   GtkColorPicker *picker;
 
-  if (gtk_should_use_portal ())
-    picker = gtk_color_picker_portal_new ();
-  else
+  picker = gtk_color_picker_portal_new ();
+  if (!picker)
     picker = gtk_color_picker_shell_new ();
+  if (!picker)
+    picker = gtk_color_picker_kwin_new ();
 
-  if (picker)
-    g_debug ("Using %s for picking colors", g_type_name_from_instance (picker));
+  if (!picker)
+    g_debug ("No suitable GtkColorPicker implementation");
   else
-    g_debug ("No suitable GtkColorPicker implementation\n");
+    g_debug ("Using %s for picking colors", G_OBJECT_TYPE_NAME (picker));
 
   return picker;
 }